Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 1 Sep 2010 00:35:05 +0000 (00:35 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 1 Sep 2010 00:35:05 +0000 (00:35 +0000)

Trivial merge